bitkeeper revision 1.538 (3f9fec6ak_pRRMuf7OrN5fWEXAx52A)
authorsmh22@labyrinth.cl.cam.ac.uk <smh22@labyrinth.cl.cam.ac.uk>
Wed, 29 Oct 2003 16:35:54 +0000 (16:35 +0000)
committersmh22@labyrinth.cl.cam.ac.uk <smh22@labyrinth.cl.cam.ac.uk>
Wed, 29 Oct 2003 16:35:54 +0000 (16:35 +0000)
commit5fefd10f168c0337bbb8479ef85015cd99ac7e2d
treef5c8f9e4a25eb227fe7f46d2cbd0b654bf6ec478
parentc91fc013d9be3142f288e0f3c9794ff476f2ce7c
parentf3e56a14e66d94a4c66248a10b1436a7c8fa1ee0
bitkeeper revision 1.538 (3f9fec6ak_pRRMuf7OrN5fWEXAx52A)

manual merge
.rootkeys
xen/common/domain.c
xen/include/hypervisor-ifs/block.h
xenolinux-2.4.22-sparse/fs/partitions/xeno.c